Merged.
authoremellor@ewan <emellor@ewan>
Wed, 28 Sep 2005 14:02:09 +0000 (15:02 +0100)
committeremellor@ewan <emellor@ewan>
Wed, 28 Sep 2005 14:02:09 +0000 (15:02 +0100)

Trivial merge